Source files moved from src/ to gdk-pixbuf/, to be consistent with other

1999-12-02  Federico Mena Quintero  <federico@redhat.com>

	Source files moved from src/ to gdk-pixbuf/, to be consistent with
	other libraries.

	* doc/Makefile.am: Modified for the new source directory.

	* configure.in: Likewise.

	* Makefile.am: Likewise.

	* autogen.sh: Likewise.

	* gdk-pixbuf/Makefile.am: Likewise.

diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am
index b45f368946628b9cdccf3e13ba8ec95a1aa15e8d..d88d1faa6cac04ed1519a612dc862d29de61b1c1 100644 (file)
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -7,7 +7,7 @@ DOC_MODULE=gdk-pixbuf
 DOC_MAIN_SGML_FILE=gdk-pixbuf.sgml
 
 # The directory containing the source code (if it contains documentation).
-DOC_SOURCE_DIR=$(GDK_PIXBUF_DIR)/src
+DOC_SOURCE_DIR=$(GDK_PIXBUF_DIR)/gdk-pixbuf
 
 CFLAGS=`gnome-config --cflags gnomeui gdk_pixbuf`
 LDFLAGS=`gnome-config --libs gnomeui gdk_pixbuf`

diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-decl.txt b/docs/reference/gdk-pixbuf/gdk-pixbuf-decl.txt
index 8b1480d1f8a34d3cf5c5fc3aef4b4c16c4e42444..04c1f85c9fcb2821851b78cca3a1e438aac35917 100644 (file)
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-decl.txt
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-decl.txt
@@ -1,23 +1,12 @@
-<TYPEDEF>
-<NAME>GdkPixbufCache</NAME>
-typedef struct {
-       int dummy;
-} GdkPixbufCache;
-</TYPEDEF>
 <FUNCTION>
-<NAME>gdk_pixbuf_cache_new</NAME>
-<RETURNS>GdkPixbufCache   *</RETURNS>
-long image_cache_limit,long pixmap_bitmap_cache_limit
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_cache_destroy</NAME>
-<RETURNS>void  </RETURNS>
-GdkPixbufCache *cache
+<NAME>gdk_pixbuf_rgb_from_drawable</NAME>
+<RETURNS>GdkPixbuf  *</RETURNS>
+GdkWindow *window, gint x, gint y, gint width, gint height
 </FUNCTION>
 <FUNCTION>
-<NAME>gdk_pixbuf_cache_load_image</NAME>
-<RETURNS>GdkPixbuf        *</RETURNS>
-GdkPixbufCache *cache,const char *file
+<NAME>gdk_pixbuf_rgba_from_drawable</NAME>
+<RETURNS>GdkPixbuf  *</RETURNS>
+GdkWindow *window, gint x, gint y, gint width, gint height
 </FUNCTION>
 <USER_FUNCTION>
 <NAME>ModulePreparedNotifyFunc</NAME>
@@ -57,6 +46,67 @@ gchar *buffer, gint size
 <RETURNS>void  </RETURNS>
 GdkPixbufModule *image_module
 </FUNCTION>
+<MACRO>
+<NAME>GDK_TYPE_PIXBUF_LOADER</NAME>
+#define GDK_TYPE_PIXBUF_LOADER            (gdk_pixbuf_loader_get_type ())
+</MACRO>
+<MACRO>
+<NAME>GDK_PIXBUF_LOADER</NAME>
+#define GDK_PIXBUF_LOADER(obj)            (GTK_CHECK_CAST ((obj), GDK_TYPE_PIXBUF_LOADER, GdkPixbufLoader))
+</MACRO>
+<MACRO>
+<NAME>GDK_PIXBUF_LOADER_CLASS</NAME>
+#define GDK_PIXBUF_LOADER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXBUF_LOADER, GdkPixbufLoaderClass))
+</MACRO>
+<MACRO>
+<NAME>GDK_IS_PIXBUF_LOADER</NAME>
+#define GDK_IS_PIXBUF_LOADER(obj)         (GTK_CHECK_TYPE ((obj), GDK_TYPE_PIXBUF_LOADER))
+</MACRO>
+<MACRO>
+<NAME>GDK_IS_PIXBUF_LOADER_CLASS</NAME>
+#define GDK_IS_PIXBUF_LOADER_CLASS(klass)  (GTK_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXBUF_LOADER))
+</MACRO>
+<STRUCT>
+<NAME>GdkPixbufLoader</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkPixbufLoader</NAME>
+struct GdkPixbufLoader
+{
+       GtkObject object;
+
+       /* < Private > */
+       gpointer private;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkPixbufLoaderClass</NAME>
+</STRUCT>
+<FUNCTION>
+<NAME>gdk_pixbuf_loader_get_type</NAME>
+<RETURNS>GtkType  </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_loader_new</NAME>
+<RETURNS>GdkPixbufLoader  *</RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_loader_write</NAME>
+<RETURNS>gboolean  </RETURNS>
+GdkPixbufLoader *loader, const gchar *buf, size_t count
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_loader_get_pixbuf</NAME>
+<RETURNS>GdkPixbuf  *</RETURNS>
+GdkPixbufLoader *loader
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_loader_close</NAME>
+<RETURNS>void  </RETURNS>
+GdkPixbufLoader *loader
+</FUNCTION>
 <STRUCT>
 <NAME>GdkPixbuf</NAME>
 </STRUCT>
@@ -172,26 +222,6 @@ GdkPixbuf *pixbuf,GdkDrawable *drawable, GdkGC *gc,int src_x, int src_y,int dest
 <RETURNS>void  </RETURNS>
 GdkPixbuf *pixbuf, GdkDrawable *drawable,int src_x, int src_y,int dest_x, int dest_y,int width, int height,GdkPixbufAlphaMode alpha_mode,int alpha_threshold,GdkRgbDither dither,int x_dither, int y_dither
 </FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_scale</NAME>
-<RETURNS>GdkPixbuf  *</RETURNS>
-const GdkPixbuf *pixbuf, gint w, gint h
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_rotate</NAME>
-<RETURNS>GdkPixbuf  *</RETURNS>
-GdkPixbuf *pixbuf, gdouble angle
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_rgb_from_drawable</NAME>
-<RETURNS>GdkPixbuf  *</RETURNS>
-GdkWindow *window, gint x, gint y, gint width, gint height
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_rgba_from_drawable</NAME>
-<RETURNS>GdkPixbuf  *</RETURNS>
-GdkWindow *window, gint x, gint y, gint width, gint height
-</FUNCTION>
 <MACRO>
 <NAME>GNOME_TYPE_CANVAS_PIXBUF</NAME>
 #define GNOME_TYPE_CANVAS_PIXBUF            (gnome_canvas_pixbuf_get_type ())
@@ -235,64 +265,3 @@ struct GnomeCanvasPixbuf {
 <RETURNS>GtkType  </RETURNS>
 void
 </FUNCTION>
-<MACRO>
-<NAME>GDK_TYPE_PIXBUF_LOADER</NAME>
-#define GDK_TYPE_PIXBUF_LOADER            (gdk_pixbuf_loader_get_type ())
-</MACRO>
-<MACRO>
-<NAME>GDK_PIXBUF_LOADER</NAME>
-#define GDK_PIXBUF_LOADER(obj)            (GTK_CHECK_CAST ((obj), GDK_TYPE_PIXBUF_LOADER, GdkPixbufLoader))
-</MACRO>
-<MACRO>
-<NAME>GDK_PIXBUF_LOADER_CLASS</NAME>
-#define GDK_PIXBUF_LOADER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXBUF_LOADER, GdkPixbufLoaderClass))
-</MACRO>
-<MACRO>
-<NAME>GDK_IS_PIXBUF_LOADER</NAME>
-#define GDK_IS_PIXBUF_LOADER(obj)         (GTK_CHECK_TYPE ((obj), GDK_TYPE_PIXBUF_LOADER))
-</MACRO>
-<MACRO>
-<NAME>GDK_IS_PIXBUF_LOADER_CLASS</NAME>
-#define GDK_IS_PIXBUF_LOADER_CLASS(klass)  (GTK_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXBUF_LOADER))
-</MACRO>
-<STRUCT>
-<NAME>GdkPixbufLoader</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkPixbufLoader</NAME>
-struct GdkPixbufLoader
-{
-       GtkObject object;
-
-       /* < Private > */
-       gpointer private;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkPixbufLoaderClass</NAME>
-</STRUCT>
-<FUNCTION>
-<NAME>gdk_pixbuf_loader_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_loader_new</NAME>
-<RETURNS>GdkPixbufLoader  *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_loader_write</NAME>
-<RETURNS>gboolean  </RETURNS>
-GdkPixbufLoader *loader, const gchar *buf, size_t count
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_loader_get_pixbuf</NAME>
-<RETURNS>GdkPixbuf  *</RETURNS>
-GdkPixbufLoader *loader
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_loader_close</NAME>
-<RETURNS>void  </RETURNS>
-GdkPixbufLoader *loader
-</FUNCTION>

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 301139ce0ba36c1df4511c8b07840f0a02a3a86d..7881c0bc568bc93e7fc43a6ff81589d40a0852d8 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,18 @@
+1999-12-02  Federico Mena Quintero  <federico@redhat.com>
+
+       Source files moved from src/ to gdk-pixbuf/, to be consistent with
+       other libraries.
+
+       * doc/Makefile.am: Modified for the new source directory.
+
+       * configure.in: Likewise.
+
+       * Makefile.am: Likewise.
+
+       * autogen.sh: Likewise.
+
+       * gdk-pixbuf/Makefile.am: Likewise.
+
 1999-12-02  Federico Mena Quintero  <federico@redhat.com>
 
        * src/testpixbuf.c: #include <config.h>, and fix includes.

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 7627615edc50ed67ffd4c6b1044797f6a83c4e33..817f0c20c581267ffe65a8c9c972064a2ecc3476 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -43,7 +43,7 @@ noinst_PROGRAMS = testpixbuf
 
 
 DEPS = libgdk_pixbuf.la
-INCLUDES = -I$(top_builddir)/src $(GLIB_CFLAGS) $(LIBART_CFLAGS) $(GTK_CFLAGS)
+INCLUDES = -I$(top_builddir)/gdk-pixbuf $(GLIB_CFLAGS) $(LIBART_CFLAGS) $(GTK_CFLAGS)
 AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
 
 LDADDS = libgdk_pixbuf.la $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS)